Skip to content

Report real Grok token usage and list-price cost from CLI logs - #3135

Open
olddonkey wants to merge 9 commits into
steipete:mainfrom
olddonkey:feat/grok-real-token-usage
Open

Report real Grok token usage and list-price cost from CLI logs#3135
olddonkey wants to merge 9 commits into
steipete:mainfrom
olddonkey:feat/grok-real-token-usage

Conversation

@olddonkey

@olddonkey olddonkey commented Aug 22, 2026

Copy link
Copy Markdown
Contributor

Problem

#3085 enabled Grok token cost, but the local session projection was not measuring actual consumption:

  • signals.json exposes ending context-window occupancy, not per-turn token usage. On a real corpus it reported 653K tokens where the completed turns contained 54.1M.
  • Grok cost was always nil, and the models.dev resolver did not include the xAI catalog.
  • Expanding the scan from small metadata files to growing updates.jsonl files could not safely remain on @MainActor.

What this changes

Read the completed-turn usage that the Grok CLI actually records

GrokLocalSessionScanner reads turn_completed events from each session's updates.jsonl, matches both session/update and _x.ai/session/update, and buckets each line by its own timestamp. It preserves raw aggregate token totals and uses the recorded modelCalls count only to approximate per-call tiered list pricing in O(1).

The parser now streams through the shared chunked JSONL reader instead of loading whole files. Production bounds are explicit: a 64 MiB tail per file, 1 MiB per record, 20,000 retained turns per file, and global scan budgets of 256 recent sessions, 256 MiB, and 100,000 turns. The process-wide LRU cache retains at most 64 files or 50,000 turns. Cancellation is checked between chunks, I/O/cancelled results are not cached, and any truncation marks history incomplete rather than presenting a partial total as complete.

Price the Grok models and preserve provenance

The models.dev xAI catalog is now eligible for cost pricing. Responses-API names such as grok-4.6-build resolve to the base grok-4.6 SKU after exact lookup, while real independent names such as grok-build-0.1 remain untouched. Cost is published as .listPriceEstimate; Grok's internal costUsdTicks is not presented as billed spend.

On a stale catalog, the scan prices immediately and refreshes in the background. On a fresh install with no catalog artifact, the first scan now awaits the initial best-effort refresh attempt before creating the snapshot, so a successful first refresh is visible in the first publication. A refresh failure still degrades to token-only data rather than failing the local scan.

Keep scanning and publication off the main actor

The provider projection consumes the async probe's snapshot. Remaining fallback paths scan on a detached utility task with a single scan in flight. A maximum-window snapshot is narrowed by each consumer through CostUsageTokenSnapshot.narrowed(toHistoryDays:calendar:), including the spend dashboard's 365-day request.

Keep OpenCodex xAI history out of the Grok subscription row

OpenCodex usage.jsonl records provider/model usage but does not retain the credential mode used for each request. Reading today's config.json cannot distinguish older API-key traffic from older OAuth traffic after a configuration switch.

For that reason, xAI entries now remain .tokenOnly and are not merged into the Grok subscription row until the producer records request-time credential provenance. The current-config reader and its routing parameter were removed, with dispatcher/fan-out regressions and updated documentation. Other existing OpenCodex subscription routes are unchanged.

Review findings addressed

  • P1 — preserve record-time xAI credential attribution: resolved by pausing OpenCodex xAI-to-Grok attribution when record-time evidence is unavailable. Historical traffic can no longer move between provider rows when the current auth config changes.
  • P2 — publish pricing after the first catalog refresh: resolved by awaiting the initial refresh only when no cached catalog exists, with a regression proving that a successful refresh prices the first returned summary. Stale catalogs still use the non-blocking refresh path.
  • P2 — bound growing session logs: resolved at 7dac4df01 with chunked tail reads, per-file and global byte/turn/session budgets, bounded LRU retention, cancellation checks, and incomplete-history propagation. Regressions cover tail truncation, global scan budgets, and cache eviction limits.
  • P3 — correct the documented session source: the earlier signals.json/30-day description now documents updates.jsonl, the requested window up to 365 days, list-price provenance, and every production bound. signals.json is metadata-only and also byte-limited.
  • The earlier repeated-probe failure was also fixed: an existing Grok local publication survives consecutive remote refresh failures instead of falling through to the generic clear path.

Real-session evidence

The opt-in live proof was run against native Grok CLI sessions through the shipped scanner and pricing path:

catalog_source=grok
today_tokens=325253
last_30_days_tokens=54121501
today_cost_usd=0.411254
window_cost_usd=50.51785399999999
cost_provenance=listPriceEstimate
history_days=365
priced_days=5
token_days=5
daily_buckets=5
available_sources=grok

The same corpus on main reported 653K tokens and no cost. An independent implementation over the same files agreed to the cent: 54,121,501 tokens / $50.52.

This live output predates the final empty-cache publication repair and bounded scanner at 7dac4df01, so it is prior behavioral evidence rather than exact-head proof. Repository policy does not allow an unrequested live provider/credential probe during review remediation; exact-head validation below therefore uses temporary homes and injected catalogs with no live credentials, network, or interactive Keychain access. A fresh redacted empty-cache run remains an explicit maintainer/requested follow-up.

Testing (exact head e6839185a)

  • swift test --filter 'OpenCodexRouteDispatcherTests|OpenCodexUsageFanOutTests|GrokLocalSessionScannerTests' — 35 tests passed.
  • make check — parser hash, manifests, packaging scripts, documentation links, SwiftFormat (0/1984) and SwiftLint (0 violations) passed.
  • make test — 922 selections, 77/77 groups, 0 failed groups, 0 retries (784.1 seconds).
  • Tests use temporary homes, injected catalogs/transports, and no live credentials, network, or interactive Keychain reads.

Adding xai to the models.dev provider set changes the pricing-cache key, so the first launch re-prices existing Codex history once. The predecessor parser hash remains compatible, so the store is adopted rather than rebuilt from JSONL.

Maintainer decision requested

Please confirm whether public xAI list-price estimates derived from local Grok CLI usage should remain visible as a clearly labeled, non-billed signal distinct from SuperGrok subscription credits. The implementation cannot resolve this product-policy sign-off itself.

No changelog entry: 0.54.1 is finalized and there is no open Unreleased section.

@clawsweeper

clawsweeper Bot commented Aug 22, 2026

Copy link
Copy Markdown

🦞👀
ClawSweeper picked this up.

Pull request received. I will update this pull request when review starts.

olddonkey added a commit to olddonkey/CodexBar that referenced this pull request Aug 22, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 09cf7edb0f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread Sources/CodexBar/UsageStore+Refresh.swift Outdated
Comment thread Sources/CodexBarCore/Providers/Grok/GrokLocalSessionScanner.swift
@clawsweeper clawsweeper Bot added merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. P2 Normal priority bug or improvement with limited blast radius. rating: 🧂 unranked krab Not merge-ready due to missing proof or serious correctness/safety concerns. status: 📣 needs proof The PR needs real behavior proof before ClawSweeper can clear the contributor ask. labels Aug 22, 2026
@clawsweeper

clawsweeper Bot commented Aug 22, 2026

Copy link
Copy Markdown

Codex review: needs real behavior proof before merge. Reviewed August 23, 2026, 6:39 AM ET / 10:39 UTC.

ClawSweeper review

What this changes

This PR replaces Grok context-occupancy estimates with bounded completed-turn log scanning, publishes xAI list-price estimates, and keeps OpenCodex xAI history token-only without request-time credential provenance.

Merge readiness

Blocked until stronger real behavior proof is added - 5 items remain

Keep this PR open: the implementation appears to address the prior code findings, but an owner must approve showing subscription-adjacent xAI list-price estimates and the submitted live proof predates the final scanner head.

Priority: P2
Reviewed head: e6839185aa6fcd6173c4498209113a6ea9dc40ce
Owner decision: Required. See Decision needed.

Review scores

Measure Result What it means
Overall readiness 🦐 gold shrimp (3/6) The patch has substantial focused coverage and no confirmed remaining code defect, but exact-head real behavior proof and owner product direction are still required.
Proof confidence 🦐 gold shrimp (3/6) Needs stronger real behavior proof before merge: Earlier real-session output and dashboard screenshots are useful, but the PR states they predate the final empty-cache and bounded-scanner head; add a fresh redacted exact-head run before merge, then update the PR body for automatic re-review or ask a maintainer to comment @clawsweeper re-review.
Patch quality 🐚 platinum hermit (4/6) No actionable review findings were identified.

Verification

Check Result Evidence
Real behavior Needs proof Needs stronger real behavior proof before merge: Earlier real-session output and dashboard screenshots are useful, but the PR states they predate the final empty-cache and bounded-scanner head; add a fresh redacted exact-head run before merge, then update the PR body for automatic re-review or ask a maintainer to comment @clawsweeper re-review.
Evidence reviewed 6 items Bounded local scanning: The final head scans completed-turn JSONL records with explicit per-file, per-record, session, byte, and turn limits, and marks incomplete history when a limit is reached.
First-catalog publication regression: The focused regression writes a catalog during the initial refresh and asserts that the first returned summary is priced.
User-facing provenance: The updated Grok documentation calls the amount a non-billed public xAI list-price estimate and distinguishes completed-turn records from signals metadata.
Findings None None.
Security None None.

Live Verification

Command: swift run codexbar --help

Result: FAIL (failed) — execution before step 1 run: sh -lc pnpm install --ignore-scripts --frozen-lockfile failed: ! Corepack is about to download https://registry.npmjs.org/pnpm/-/pnpm-11.22.0.tgz

sh -lc pnpm install --ignore-scripts --frozen-lockfile failed: ! Corepack is about to download https://registry.npmjs.org/pnpm/-/pnpm-11.22.0.tgz

Assertions:

  • FAIL expect_output: Usage:

How this fits together

CodexBar converts provider snapshots and local logs into normalized token-and-cost snapshots for its Usage & Spend dashboard. This change alters the Grok local-log input, price lookup, and fallback publication path before the dashboard renders the provider row.

flowchart LR
A[Grok CLI session logs] --> B[Bounded completed-turn scanner]
C[xAI price catalog] --> D[Price resolution]
B --> D
D --> E[Usage and Spend snapshot]
E --> F[Grok provider row]
G[OpenCodex xAI records] --> H[Token-only routing]
H --> E
Loading

Decision needed

Question Recommendation
Should CodexBar present xAI API list-price estimates derived from local Grok CLI activity alongside SuperGrok usage as a clearly labeled non-billed signal? Approve labeled list-price estimates: Keep the implementation after fresh exact-head proof confirms the visible result remains explicitly non-billed.

Why: The branch adds a user-visible interpretation of local provider data rather than merely correcting an internal parser, and VISION.md reserves new provider-data behavior for sign-off.

Before merge

  • Add real behavior proof - Needs stronger real behavior proof before merge: Earlier real-session output and dashboard screenshots are useful, but the PR states they predate the final empty-cache and bounded-scanner head; add a fresh redacted exact-head run before merge, then update the PR body for automatic re-review or ask a maintainer to comment @clawsweeper re-review.
  • Resolve merge risk (P1) - Existing users will see materially different Grok token totals and a new dollar figure; list price is not subscription billing and requires explicit owner approval.
  • Resolve merge risk (P1) - The available live output and screenshots predate the final bounded-scanner and empty-cache publication head, so they do not prove exact-head behavior in a real local Grok setup.
  • Complete next step (P2) - The remaining blockers are owner product direction and contributor-supplied exact-head real behavior proof, not a narrow repair suitable for an automated fix branch.
Agent review details

Security

None.

Review metrics

Metric Value Why it matters
Production versus test delta production +1,283/-160; tests +1,473/-120; docs +50/-17 The implementation substantially expands the local scanner and has commensurate focused regression coverage, so owner sign-off and exact-head proof matter before landing.
Changed surface 25 files affected The change crosses local scanning, pricing, publication, dashboard routing, documentation, and regression suites.

Merge-risk options

Maintainer options:

  1. Approve and verify the new cost meaning (recommended)
    Obtain owner sign-off and a fresh redacted exact-head Grok run before merge, confirming visible totals, list-price provenance, and incomplete-history handling.
  2. Retain the established token-only presentation
    Pause or close the PR if the product should not show an API-rate estimate for subscription activity.

Technical review

Best possible solution:

Land only if the owner approves the clearly labeled list-price signal and the contributor adds a fresh redacted exact-head run showing token totals, cost, provenance, and bounded-history status.

Do we have a high-confidence way to reproduce the issue?

Yes for the source behavior: the final head has deterministic fixture regressions for completed turns, cache refresh, bounds, and fallback publication. No fresh exact-head real-session reproduction has been supplied, so the user-visible result remains unproven on a live corpus.

Is this the best way to solve the issue?

Unclear: the scanner and provenance boundary are well covered in source, but whether a subscription-adjacent API list-price amount belongs in the product requires the requested owner decision.

AGENTS.md: found and applied where relevant.

Codex review notes: model internal, reasoning high; reviewed against 27c7f334e3c4.

Labels

Label changes:

  • add rating: 🦐 gold shrimp: Overall readiness is 🦐 gold shrimp; proof is 🦐 gold shrimp and patch quality is 🐚 platinum hermit.
  • remove rating: 🦪 silver shellfish: Current PR rating is rating: 🦐 gold shrimp, so this older rating label is no longer current.

Label justifications:

  • P2: This is a meaningful but non-emergency provider usage-and-cost behavior change.
  • merge-risk: 🚨 compatibility: The PR changes established Grok totals and adds a new dollar interpretation for existing local histories.
  • merge-risk: 🚨 availability: The new local JSONL scanning and asynchronous publication path must remain responsive under growing session logs.
  • rating: 🦐 gold shrimp: Overall readiness is 🦐 gold shrimp; proof is 🦐 gold shrimp and patch quality is 🐚 platinum hermit.
  • status: 📣 needs proof: The PR needs real behavior proof before ClawSweeper can clear the contributor ask. Needs stronger real behavior proof before merge: Earlier real-session output and dashboard screenshots are useful, but the PR states they predate the final empty-cache and bounded-scanner head; add a fresh redacted exact-head run before merge, then update the PR body for automatic re-review or ask a maintainer to comment @clawsweeper re-review.
  • proof: 📸 screenshot: Contributor real behavior proof includes screenshot evidence. Earlier real-session output and dashboard screenshots are useful, but the PR states they predate the final empty-cache and bounded-scanner head; add a fresh redacted exact-head run before merge, then update the PR body for automatic re-review or ask a maintainer to comment @clawsweeper re-review.

Evidence

What I checked:

Likely related people:

  • Peter Steinberger: Current-main blame attributes the shipped Grok local-session baseline to the release lineage, and the current main tip is authored by Peter Steinberger. (role: recent baseline contributor; confidence: high; commits: 22a2168842a9, 27c7f334e3c4; files: Sources/CodexBarCore/Providers/Grok/GrokLocalSessionScanner.swift, VISION.md)
  • Chipagosfinest: Merged PR 3085 introduced the Grok and xAI Usage & Spend projection that this branch revises. (role: introduced Usage & Spend Grok surface; confidence: high; commits: 3bfbffdcea58; files: Sources/CodexBarCore/Providers/Grok/GrokLocalSessionScanner.swift, Sources/CodexBar/SpendDashboardController.swift)

Rank-up moves

Optional improvements that raise the rating; they are not merge blockers.

  • Add a fresh redacted exact-head Grok run showing tokens, dollar estimate, list-price provenance, and history completeness.
  • Obtain owner approval for displaying the non-billed list-price signal.

Rating scale

Score Internal tier Crab rank Meaning
6/6 S 🦀 challenger crab Exceptional readiness
5/6 A 🦞 diamond lobster Very strong readiness
4/6 B 🐚 platinum hermit Good normal PR; ordinary maintainer review
3/6 C 🦐 gold shrimp Useful, but confidence is limited
2/6 D 🦪 silver shellfish Proof or implementation needs work
1/6 F 🧂 unranked krab Not merge-ready
N/A NA 🌊 off-meta tidepool Rating does not apply

Overall follows the weaker of proof and patch quality.
Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

Workflow

  • ClawSweeper keeps one durable marker-backed review comment per issue or PR.
  • Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
  • A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
  • PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
  • Maintainers can also comment @clawsweeper review to request a fresh review only.
  • Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
  • Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
  • Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

History

Review history (7 earlier review cycles)
  • reviewed 2026-08-22T04:34:29.973Z sha 08360b5 :: needs real behavior proof before merge. :: [P1] Preserve the Grok fallback on repeated probe failures | [P2] Refresh xAI pricing before deriving Grok estimates
  • reviewed 2026-08-22T06:27:26.097Z sha e3cd3b9 :: needs real behavior proof before merge. :: [P1] Avoid treating every xAI record as Grok subscription usage | [P2] Republish priced Grok data after the catalog refresh
  • reviewed 2026-08-22T07:47:36.784Z sha 03e5a25 :: needs real behavior proof before merge. :: [P1] Do not map every xAI log record to the Grok subscription | [P2] Republish the Grok snapshot after a missing catalog refreshes
  • reviewed 2026-08-22T08:54:29.255Z sha 44d79a9 :: needs real behavior proof before merge. :: [P1] Avoid reclassifying historical xAI usage from current config | [P2] Republish Grok after a missing price catalog refreshes
  • reviewed 2026-08-22T17:42:53.685Z sha 44d79a9 :: found issues before merge. :: [P1] Preserve record-time xAI credential attribution | [P2] Republish after the first pricing catalog refresh
  • reviewed 2026-08-23T09:35:09.032Z sha 211e197 :: needs real behavior proof before merge. :: [P2] Bound the JSONL scan before loading each session log | [P3] Update the documented Grok session source
  • reviewed 2026-08-23T10:20:54.506Z sha 7dac4df :: needs real behavior proof before merge. :: none

…on logs

two ways and expensive in a third.

Wrong tokens: the scanner summed `contextTokensUsed` from `signals.json`, which
is the session's ENDING context-window occupancy, not what it consumed. On a
real machine that reported 653K where actual consumption was 48.0M. Read the
sibling `updates.jsonl` instead, where every `turn_completed` event carries the
turn's real usage, and bucket by the per-line timestamp so a session crossing
local midnight lands in both days.

No cost: `toCostUsageTokenSnapshot` hardcoded nil dollars, and nothing could
have priced a Grok model anyway because `codexModelsDevProviderIDs` had no
`xai`. Add it, and resolve `grok-<version>-build` onto its base catalog model —
the `-build` suffix is an artifact of the responses-API surface, not a separate
SKU. `grok-build-0.1` is a real model and is never rewritten. Cost is the public
xAI card via models.dev, provenance `.listPriceEstimate`, so Grok stays
comparable with Claude and Codex. grok's own `costUsdTicks` is deliberately not
used for display.

A turn's `usage` is the aggregate of `modelCalls` API calls, so tiering on the
turn total would push nearly every multi-call turn into the >=200k bracket.
Price on the per-call average instead, in closed form over the two synthetic
call groups. This under-tiers slightly when context grows within a turn
(measured ~4% below the vendor's own accounting on a 27-turn sample, against
~+10% for aggregate tiering); the trade is documented at the call site and
pinned by a test.

Main-actor cost: the scan ran synchronously inside `@MainActor UsageStore` on
every menu-card build, refresh and dashboard load. It now reads the projection
the async probe already produced, and the remaining fallback scans on a
detached task with one scan in flight at a time. The probe projects the maximum
window and consumers narrow it, so `costUsageHistoryDays` and the dashboard's
365-day request are both honoured.

Hardening: `modelCalls` comes from a file, so it is validated before it can size
any work; parsing is cached per (path, size, mtime) with entries evicted when a
file is no longer visited; the cache lock is not held across file reads.

Note for upgraders: adding `xai` to `codexModelsDevProviderIDs` changes the
Codex pricing-cache key, so the first launch after this re-prices existing Codex
history once. Same one-time cost as when kimi and deepseek were added.
OpenCodex sends inference straight to api.x.ai using the Grok account's OAuth
credentials, so it burns the same SuperGrok subscription the Grok provider
reports on. It only spawns the `grok` binary to refresh tokens, so those
requests never reach ~/.grok/sessions and the local session scanner cannot see
them — 1,435 requests on one real machine that CodexBar attributed to nothing.

Route the `xai` provider prefix to the Grok subscription, the same way `openai`
already routes to Codex. Like that mapping, this routes on the prefix and does
not distinguish OAuth from API-key traffic. The `-build` suffix seen in the data
is a responses-API protocol artifact, not a separate billing pool, so traffic is
not split by it.

Routing alone would have produced tokens with no dollars. The aggregator priced
the bare `entry.model`, and a name without a route prefix is resolved against
the `openai` provider — which is why `gpt-5.6-sol` prices today and `grok-4.6`
resolved to `openai/grok-4.6` and missed. Qualify an unprefixed model with its
provider before pricing. Codex rows are unaffected (the qualified name resolves
to the same target), and providers outside the supported set keep returning nil.
Grok resolved list prices straight out of the cached models.dev catalog, but
nothing in its path ever fetched that catalog. The only fetch trigger is
CostUsageFetcher.refreshPricingIfAllowed, which is gated to Codex and Claude —
and Grok never reaches it at all, because its snapshot comes from the provider
probe rather than the shared token-cost pipeline.

On a machine where Codex or Claude is also enabled the cache is already there,
so this is invisible. Enable only Grok and the file never appears: every price
lookup returns nil and the Cost row shows tokens with no money, permanently.

Request ModelsDevPricingPipeline.refreshIfNeeded from the Grok scan paths. It is
safe to call repeatedly — it returns immediately unless the cache is stale and
serialises through its own coordinator — and it is detached rather than awaited,
matching how the Codex and Claude paths already treat it: pricing availability
must never delay or fail a local scan, and the next refresh fills in the value.

`summarize` stays synchronous and side-effect free; the refresh lives in a
wrapper so the parse-cache behaviour and existing tests are untouched.

Reported as P2 by the automated review on the pull request.
… proof

The opt-in live proof scanned real sessions but printed tokens only, which
cannot evidence the half of this change that is about money. It now also
reports today's and the window's list-price cost, the provenance, the window
actually used, and how many days carried a price versus tokens — so an
all-unpriced result is visible in the output instead of reading as zero.

Still skipped unless CODEXBAR_LIVE_GROK_CATALOG_PROOF=1.
@olddonkey
olddonkey force-pushed the feat/grok-real-token-usage branch from 08360b5 to e3cd3b9 Compare August 22, 2026 06:21
@olddonkey olddonkey changed the title Report real Grok token usage and list-price cost from CLI session logs Report real Grok token usage and list-price cost, from the CLI logs and OpenCodex alike Aug 22, 2026
@clawsweeper clawsweeper Bot added merge-risk: 🚨 auth-provider 🚨 Merging this PR could break OAuth, tokens, provider routing, model choice, or credentials. rating: 🦐 gold shrimp Decent PR readiness signal, but merge confidence is limited. and removed rating: 🧂 unranked krab Not merge-ready due to missing proof or serious correctness/safety concerns. labels Aug 22, 2026
The regression guard drove a single failing refresh after a local publication
existed. The defect it covers is specifically about the *second* failure: the
first one publishes through the fallback scan, and only the next one arrives
with a publication already in place — which is what used to hit the generic
clear branch. Drive the failure twice and assert the row and the scan count
both hold.
@olddonkey

Copy link
Copy Markdown
Contributor Author

Both automated findings are addressed, plus the review's other checklist items. The inline comments were left against 09cf7edb0, which no longer exists — the branch has since been rebased onto 27c7f334e and the head is now 03e5a25dc, so I'm summarising here rather than replying in a stale diff.

P1 — Preserve the Grok fallback on repeated probe failures

Fixed in 923193ec0, Sources/CodexBar/UsageStore+Refresh.swift. The guard had been hoisted into the if provider == .grok, publication == nil condition, so a Grok failure with a publication fell through to the generic else if tokenCostRequiresProviderSnapshot { clearTokenSnapshot } branch. Grok now owns its branch outright and can never reach the clear:

if provider == .grok {
    if self.tokenSnapshotPublicationForCurrentProviderConfig(for: provider) == nil {
        Task { @MainActor [weak self] in
            await self?.scanAndPublishGrokLocalTokenSnapshot(...)
        }
    }
} else if Self.tokenCostRequiresProviderSnapshot(provider) {
    self.clearTokenSnapshot(for: provider)
}

Regression coverage is in missing remote snapshot scans and publishes local tokens then clears empty data. Per the review's request it now drives two consecutive failing refreshes (03e5a25dc) rather than one — which matters here, because the first failure is what publishes through the fallback scan and only the second arrives with a publication in place, i.e. the failure that used to wipe the row. Both iterations assert the row still reads 77 tokens and that no redundant rescan ran.

P2 — Refresh pricing before scanning Grok sessions

Correct, and thank you — this was a genuine gap and not one the local tests would have surfaced. refreshPricingIfAllowed is gated to Codex and Claude, and Grok never reaches it at all because its snapshot comes from the provider probe rather than CostUsageFetcher.loadTokenSnapshot. On a machine with Codex or Claude also enabled the shared cache is already populated, so the failure is invisible there; enable only Grok and the catalog never appears and the Cost row shows tokens with no money, permanently.

Fixed in 744677e68. The Grok scan paths now request ModelsDevPricingPipeline.refreshIfNeeded through a summarizeRequestingPricingRefresh wrapper, called from all four scan sites (GrokStatusProbe, both branches in GrokProviderDescriptor, and UsageStore.scanAndPublishGrokLocalTokenSnapshot). It is detached rather than awaited, matching how the Codex and Claude paths already treat it — pricing availability must not delay or fail a local scan — and it is safe to call repeatedly, since it returns immediately unless the cache is stale and serialises through its own coordinator. summarize itself stays synchronous and side-effect free.

Note the inline comment still points at GrokLocalSessionScanner.swift:662; that line is the unchanged pricing lookup, and the fix is upstream of it in the new wrapper, so the anchor looks live even though it is addressed.

Coverage: absent models dev cache requests a background refresh, stale models dev cache requests a background refresh, and fresh models dev cache skips the background refresh. All three assert whether a refresh was requested through an injected transport — no test touches the network.

Real-session evidence

CODEXBAR_LIVE_GROK_CATALOG_PROOF=1 swift test --filter GrokXAISpendCatalogTests, against real local Grok CLI sessions, through the shipped code path:

catalog_source=grok
today_tokens=5043749
last_30_days_tokens=52696354
today_cost_usd=3.3471699999999993
window_cost_usd=49.353424
cost_provenance=listPriceEstimate
history_days=365
priced_days=4
token_days=4
daily_buckets=4
available_sources=grok

The same corpus on main reports 653K tokens and no cost. history_days=365 shows the requested window is honoured (it was pinned to 30). priced_days == token_days shows no day was silently left unpriced. The gated proof was extended in e3cd3b9ce to print cost, provenance and priced-day coverage, since tokens alone cannot evidence the half of this change that is about money.

Those figures were cross-checked against an independent reimplementation of the pricing formula over the same logs; the two agree to the cent.

Merge risk / branch state

Rebased onto current main (27c7f334e); the branch reports clean. Full suite on the head: 77/77 groups, 922 selections, 0 failures. swiftformat --lint and swiftlint --strict clean. Upstream CI green on the previous head including all three Linux builds.

One thing deliberately left undone: no CHANGELOG.md entry. 0.54.1 was finalized and there is no open Unreleased section, so I did not invent a version heading — happy to add one wherever you prefer.

@clawsweeper clawsweeper Bot added rating: 🧂 unranked krab Not merge-ready due to missing proof or serious correctness/safety concerns. and removed rating: 🦐 gold shrimp Decent PR readiness signal, but merge confidence is limited. labels Aug 22, 2026
Routing every OpenCodex `xai` record to the Grok subscription is right for the
case that motivated it — traffic authenticated with the user's Grok account,
which is what makes it burn the SuperGrok quota. It is wrong for anyone using an
xAI API key: their pay-as-you-go developer-platform spend gets folded into the
subscription row, silently inflating it. CodexBar models that platform as its
own xAI provider precisely to keep the two apart.

The usage log carries no per-record credential evidence, so the decision has to
come from the OpenCodex provider config, which records `authMode` per provider.
Read it, and attribute to Grok only when that mode is OAuth; anything else is
token-only spend that belongs to no tracked subscription.

Fail closed: a missing or malformed config, no `xai` entry, or an absent
`authMode` all count as no OAuth evidence and keep the records off the Grok row.
The dispatcher stays a pure function — the set of OAuth-backed provider ids is
threaded in from the caller rather than read at the routing site — and the gate
applies only to `xai`, leaving the other routes exactly as they were.

Also records why the Grok pricing refresh stays fire-and-forget: the parse cache
holds parsed turns rather than prices, so the next scan reprices against the
refreshed catalog, and plumbing completion back to republish was judged
disproportionate to a delay Codex and Claude already share.

Raised as P1 by the automated review; the owner chose verifiable attribution
over prefix-only routing.
@clawsweeper clawsweeper Bot added rating: 🦐 gold shrimp Decent PR readiness signal, but merge confidence is limited. and removed rating: 🧂 unranked krab Not merge-ready due to missing proof or serious correctness/safety concerns. labels Aug 22, 2026
@olddonkey

olddonkey commented Aug 22, 2026

Copy link
Copy Markdown
Contributor Author

Both new findings addressed at 44d79a95a.

P1 — Do not map every xAI log record to the Grok subscription

Agreed, and taken as specified rather than argued down. Routing on the prefix alone is right for the case that motivated this — traffic authenticated with the user's Grok account, which is what makes it consume SuperGrok quota — but it silently folds an API-key user's pay-as-you-go xAI spend into the subscription row. CodexBar already models the developer platform as its own xai provider precisely to keep those apart, so the old behaviour crossed a boundary the app deliberately maintains.

The usage log carries no per-record credential evidence; I checked every field emitted for xai rows (requestId, timestamp, provider, model, requestedModel, resolvedModel, usage, usageStatus, status, routeDecision, …) and there is nothing about auth, account or key. The signal that does exist is ~/.opencodex/config.json, which records authMode per provider.

So attribution now requires positive OAuth evidence:

  • xai routes to .subscription(.grok) only when its configured authMode is OAuth. Anything else returns .tokenOnly — the spend is real, it just belongs to no tracked subscription — rather than .unknown, which would read as "unrecognised provider".
  • Fail closed. A missing or malformed config, a providers block without xai, or an entry without authMode all count as no evidence and keep the records off the Grok row.
  • OpenCodexRouteDispatcher stays a pure function. The set of OAuth-backed provider ids is threaded in from the caller (OpenCodexUsageFanOutSpendDashboardSource), so the routing site never touches the filesystem and every existing caller and test that does not care about auth keeps working.
  • The gate applies only to xai. openai, kimi-coding, deepseek and opencode-go are untouched — changing them would be an unreviewed behaviour change for other providers — and a test pins that they ignore xAI auth state entirely.

Coverage: xai OAuth config routes to Grok, xai non OAuth config stays token only (parameterised over several non-OAuth values), xai routing fails closed without readable complete OAuth config, non xai subscription routes ignore xai auth state, plus fan-out cases proving the same entries land on the Grok row under an OAuth config and are absent under an API-key one. No test reads the developer's real ~/.opencodex; the home directory is injected.

docs/grok.md no longer claims this path cannot distinguish OAuth from API-key traffic, because it now can.

P2 — Republish the Grok snapshot after a missing catalog refreshes

I looked at this closely and am deliberately not adding a republish path. Reasoning, so you can overrule it if you disagree:

The refresh is fire-and-forget, so the scan that requests it returns whatever the cache currently holds — that part is accurate. But the parse cache stores parsed turns, not prices, so aggregation and pricing re-run on every summarize. The next Grok scan therefore prices against the refreshed catalog with no extra machinery, bounding the unpriced window to a single refresh cycle. That is the same behaviour Codex and Claude already have: refreshPricingIfAllowed dispatches into Task.detached and their current scan does not wait for it either.

The alternative — plumbing a completion signal back across the actor boundary into the @MainActor publication path — buys one refresh cycle of latency on first run, at the cost of a new cross-actor completion path in code that publishes user-visible spend. That trade looked disproportionate, and inconsistent with how the two established providers behave. I have recorded the reasoning as a comment at the call site rather than leaving it implicit, so the next reader does not have to re-derive it.

Happy to build it if you would rather have it.

Evidence

The attribution itself only becomes visible in the app: SpendDashboardSource.mergingOpenCodexInputs is what merges the fan-out into provider rows, and the CLI's cost command reports OpenCodex as its own source rather than routing it, so terminal output cannot show this path. The figures below are read off the freshly packaged build running against real local data, on a machine whose ~/.opencodex/config.json has "xai": { "authMode": "oauth" }; screenshots of both panes follow.

The two halves stay distinguishable in the UI, which makes the attribution legible rather than something you have to take on trust: the CLI goes through the responses API so its SKU is grok-4.6-build, while OpenCodex's records resolve to the bare grok-4.6 / grok-4.5 / grok-4.3. Both sit under the Grok provider.

model row source shown
grok-4.6-build Grok CLI session logs $50.52 · 54M
grok-4.6 OpenCodex $161.21 · 182M
grok-4.5 OpenCodex $4.54 · 5.5M
grok-4.3 OpenCodex $0.50 · 201K

Independently recomputing the same corpus agrees to the cent on both halves: 54,121,501 tokens / $50.52 for the CLI logs, and $166.25 across 1,520 OpenCodex xai records. The CLI half is reproducible by anyone on their own machine through the gated proof test (CODEXBAR_LIVE_GROK_CATALOG_PROOF=1), whose output is in the PR body.

The negative direction — API-key traffic staying off the Grok row — is covered by tests rather than a screenshot, since demonstrating it live would mean rewriting the machine's OpenCodex config.

State

Full suite on 44d79a95a: 77/77 groups, 922 selections, 0 failures. swiftformat --lint and swiftlint --strict clean. Rebased on 27c7f334e.

image image

@clawsweeper clawsweeper Bot added proof: 📸 screenshot Contributor real behavior proof includes screenshot evidence. proof: sufficient Contributor real behavior proof is sufficient. status: ⏳ waiting on author ClawSweeper has contributor-facing work open and is waiting for author action. and removed status: 📣 needs proof The PR needs real behavior proof before ClawSweeper can clear the contributor ask. labels Aug 22, 2026
@olddonkey olddonkey changed the title Report real Grok token usage and list-price cost, from the CLI logs and OpenCodex alike Report real Grok token usage and list-price cost from CLI logs Aug 23, 2026
@olddonkey

Copy link
Copy Markdown
Contributor Author

Addressed both current findings in 211e1977d and resolved the two review threads.

  • P1 / historical xAI attribution: removed current-config-based xAI → Grok routing. usage.jsonl has no request-time credential provenance, so xAI records now remain token-only until the producer can persist that evidence. Removed the config reader/plumbing and added dispatcher/fan-out regressions.
  • P2 / first pricing publication: when no models.dev artifact exists, the first Grok scan now awaits the initial best-effort refresh attempt before summarizing. A successful refresh prices the first returned snapshot; stale catalogs still price immediately and refresh in the background. Added a regression that writes the catalog during refresh and asserts the first summary is priced.
  • Updated the PR title/body and docs/grok.md so they no longer claim OpenCodex xAI traffic is merged into the Grok subscription row.

Validation on the exact pushed head:

  • focused Grok/OpenCodex suites: 32 tests passed
  • make check: passed
  • make test: 922 selections, 77/77 groups, 0 failed groups, 0 retries
  • branch is based on current main (27c7f334e) and the merge-tree is clean

@clawsweeper re-review

@clawsweeper

clawsweeper Bot commented Aug 23, 2026

Copy link
Copy Markdown

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event exact_review_queue).
Result: when the review finishes, ClawSweeper will create the durable review comment if needed or update the existing comment in place.

@clawsweeper clawsweeper Bot added merge-risk: 🚨 availability 🚨 Merging this PR could cause crashes, hangs, restart loops, stalls, or process outages. rating: 🦪 silver shellfish Thin PR readiness signal; proof, validation, or implementation needs work. status: 📣 needs proof The PR needs real behavior proof before ClawSweeper can clear the contributor ask. and removed merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. proof: sufficient Contributor real behavior proof is sufficient. proof: 📸 screenshot Contributor real behavior proof includes screenshot evidence. status: ⏳ waiting on author ClawSweeper has contributor-facing work open and is waiting for author action. merge-risk: 🚨 auth-provider 🚨 Merging this PR could break OAuth, tokens, provider routing, model choice, or credentials. rating: 🦐 gold shrimp Decent PR readiness signal, but merge confidence is limited. labels Aug 23, 2026
@olddonkey

Copy link
Copy Markdown
Contributor Author

Addressed both findings from the 211e1977d review at exact head 7dac4df01.

  • P2 / bounded JSONL scan: replaced whole-file Data(contentsOf:) ingestion with the shared chunked scanner. Production limits are 64 MiB/file, 1 MiB/record, 20,000 turns/file, 256 recent sessions, 256 MiB and 100,000 turns per scan, plus a process LRU capped at 64 files / 50,000 turns. Cancellation is checked between chunks; cancelled/I/O-error decodes are not cached; any dropped history propagates historyCoverageIsEstablished = false.
  • P3 / documentation: replaced the stale signals.json/30-day description with completed-turn updates.jsonl, the requested window up to 365 days, the non-billed list-price provenance, metadata-only signals.json, and the exact bounds above.
  • Added regressions for bounded tail retention/incomplete coverage, global newest-session/turn budgets, and process-wide cache eviction.

Exact-head validation:

  • focused Grok/OpenCodex suites: 35 tests passed
  • make check: passed, SwiftFormat 0/1984 and SwiftLint 0 violations
  • make test: 922 selections, 77/77 groups, 0 failed groups, 0 retries
  • branch is current with main (27c7f334e) and git diff --check is clean

I did not rerun the gated real-account proof because repository policy forbids unrequested live provider/credential probes. The PR body now labels the earlier live output as pre-final-head evidence and leaves a fresh redacted empty-cache run as an explicit maintainer/requested follow-up. The product-policy question about showing clearly labeled public list-price estimates also remains for owner sign-off.

@clawsweeper re-review

@clawsweeper

clawsweeper Bot commented Aug 23, 2026

Copy link
Copy Markdown

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event exact_review_queue).
Result: when the review finishes, ClawSweeper will create the durable review comment if needed or update the existing comment in place.

Re-review progress:

@clawsweeper clawsweeper Bot added merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. proof: 📸 screenshot Contributor real behavior proof includes screenshot evidence. labels Aug 23, 2026
@olddonkey

Copy link
Copy Markdown
Contributor Author

Pushed e6839185a to fix the Linux-only compile failure reported by CI. Darwin exposes the labeled autoreleasepool(invoking:) form while Linux rejects that label, so decoding now goes through a small conditional helper: scoped autorelease pool on Darwin, direct decode elsewhere. No scanner behavior or bounds changed.

Final exact-head validation:

  • focused OpenCodex/Grok suites: 35 tests passed
  • make check: passed (SwiftFormat 0/1984, SwiftLint 0 violations)
  • make test: 922 selections, 77/77 groups, 0 failed, 0 retries (784.1s)

@clawsweeper re-review

@clawsweeper

clawsweeper Bot commented Aug 23, 2026

Copy link
Copy Markdown

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event exact_review_queue).
Result: when the review finishes, ClawSweeper will create the durable review comment if needed or update the existing comment in place.

@clawsweeper clawsweeper Bot added rating: 🦐 gold shrimp Decent PR readiness signal, but merge confidence is limited. and removed rating: 🦪 silver shellfish Thin PR readiness signal; proof, validation, or implementation needs work. labels Aug 23, 2026
@olddonkey

Copy link
Copy Markdown
Contributor Author

Final exact-head status for e6839185aa6fcd6173c4498209113a6ea9dc40ce:

  • GitHub CI is fully green: lint, path gates, Linux x64, Linux ARM64, Linux musl, both macOS test shards, aggregate gate, and GitGuardian.
  • ClawSweeper reviewed this exact SHA and reports Findings: None.
  • Both inline review threads are resolved.
  • The branch is current with upstream/main, has a clean merge-tree, and GitHub reports MERGEABLE / CLEAN.

The only remaining gates are intentionally human: a fresh redacted exact-head live Grok proof (requires explicit authorization under repository policy) and owner approval of the clearly labeled non-billed xAI list-price signal.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-risk: 🚨 availability 🚨 Merging this PR could cause crashes, hangs, restart loops, stalls, or process outages. merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. P2 Normal priority bug or improvement with limited blast radius. proof: 📸 screenshot Contributor real behavior proof includes screenshot evidence. rating: 🦐 gold shrimp Decent PR readiness signal, but merge confidence is limited. status: 📣 needs proof The PR needs real behavior proof before ClawSweeper can clear the contributor ask.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant